Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 19 Jan 2011 21:54:19 +0000 (13:54 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 19 Jan 2011 21:54:19 +0000 (13:54 -0800)
commit08d5afcb10470605a4c36b6af84a33b1dcb9e53d
treef7e860773adc8b131120f084a2efb189d883a344
parentc1c52675683a57fb404e771965189b0284aeda4f
parent3304d8e93ea7b02b06014f415cd9ccce9f7cffc4
Merge from mainline.